Augment the grammar a little bit and display AST