Haxe 3 changes, code cosmetics