Make mappings canonical