Updating to handle both Haxe 2.10 and 3.0