Type change cleanup on JCE and MCE. Patch by Aaron Gray