Grammar updated to get rid of the dangling else ambiguity