A minor re-design of the core.