A little simplification of the base classes.