Thanks for noticing! I've changed it back to highway=trunk and added a note on the sections and commit message for future mappers to notice. I struggled to find formal confirmation that this is the case and ended up using https://en.wikipedia.org/wiki/Dunedin_Southern_Motorway to determine which section is not a motorway.