Moved contribPhotonSwap() outside contribSortRecurse() after errors were reported under clang by Ken on MacOS. Apprently nested functions are no longer allowed in C99. This means variables that were previously within scope now have to be explicitly passed as additional parameters. It is assumed the compiler will optimise this code as inline, but can we rely on that?