Rename skip_scan => scan, inside lexer
Use pushback() in all cases to move scanner pos