Got rid of shift/reduce conflicts in parser