Further cleaning of constants

All constant references now are done by self.C