Faster parser integrated with mainline. Remove old perf test. Fix #46