Cleanup and enhancements to base classes.