minor
cleanup some circular dependencies
Merge branch 'genpy' of github.com:Simn/haxe into genpy