Fix tokenizer missing certain types of tokens when not preceded by whitespace