Move tokeniser into lop