Small cleanup to parser code