Some header and comment clean up in the grammar tree