Fix to build on current nightly
Match some tree stuff to similar token stuff
Rename some tokens to be more literal