Continuing refactoring on parser core fixture.