Okay, more refactoring simply due to the pathetic limitations of Haxe typedefs.