Replaced two simple wrapper classes with a simple class factory.