The add*Before functions no longer act upon the previous token and isntead manipulate the passed token. This was required before changesets were introduced, but should no longer be required.
Added fixes for more errors