Adding changes to relieve StructureMap configuration problems.