Improved type safety in coredom.