Cleaned up some of the PhotonDataBasic member function implementationions.