more speedups to the parser.
Merge branch 'master' of github.com:dlwh/epic