Making progress on AbstractFactory+FactoryLocator implementation.