Cleanup of org.parboiled.matchervisitors.*