Updated grammars and support writing of needed helper functions.