Some cleanup of parser.rb