Add tests to deal with 'with X as Y' situations not binding correctly
Patch the token categorizer to handle with correctly
Merge branch 'with'
Bump version number for with X as Y: fix