Switching to list comprehension for some rules instead of recursive descent
Fixed merge