SERVER-22125 SERVER-22126 SERVER-22127 and SERVER-22128 described separate loosely defined components of a single system. Some of the structure of the classes in this system was imposed from this separation. As components are merged, some of the artificial structure may be relaxed.