tidy up some core type registrations