MatchUnpacking
I had hoped that git would be able to see this as a rename, and therefore I haven't done autoformat