Cleanups for the core classes, #395