Clean up small part of parser code

Just minor cleanups