Tidied up some of the switch statements in MessageBuilder and MacroUtilities, thanks to some of the new pattern-matching features in Haxe 3.