Collapse nodes with only one child and no additional text content
Add more features to javascript grammar
Clean up parser macros more