Fixups for simplified core types.