Reformat remaining parser rules to improve readability