ElectronPhotonFourMomentumCorrection: Add check thread safety, fixes, and tidy a bit
ping @ssnyder and @fwinkl hoping to avoid work duplication as I know they look at these.
I know the package is supposed to be cleaned up and is not used in production .