Got &rest working, tests pass

Did a little house cleaning in lex states.py too and started removing
stupid print() statements.