clean up grammar and tree in prep for #543