Correctly handle composite maps.