Lexer changes to new @-is-part-of-token regime
Remove extraneous print statements
Fix complex structures using new lexer