CPQuantities: adjustments due to Phi -> PhiCP; some clean up