yay all tests pass and marginally faster parsing