CoreTypes.h cleanup.