Just undid all the changes to ScalrParser.jj made during our meeting with Karan.