Refactor ClassMapProxy away.  Needed for upcoming extensions.