Separate move & current for tokenizer