Added more grammar transformations (mostly formatting).