Updating grammar to have comments after statements
Making sure that the comments that are after the statement work for the block as
well