var-declaration and tokenizer fixes