Polygon Converter is a Chisel plugin that allows much more logical remapping of M1 to M2 or Infinity polygon types. This plugin is also available as part of the Chisel 2.1.6-enhanced package.