More work on grammar and multiline.