All tests pass on Pegex branch