Further cleanup and pass macrocell number to cl version of DGMass directly.