Add in extra handling of N/M conflation.