Reduce the number of methods to reduce the levels
of indirection. Also, made the CE methods easier
to extend so the EE overrides are simpler.