various porting changes
Merge branch 'master' of github.com:ingydotnet/pegex-pm