minor restructuring, fix non-exhaustive pattern-matching
minor restructuring, fix non-exhaustive pattern-matching

pleclech/hacking-haxe,pleclech/hacking-haxe,pleclech/hacking-haxe,pleclech/hacking-haxe,pleclech/hacking-haxe,pleclech/hacking-haxe