Remove duplication and speed up test runs after a parsetab change