Penultimate commit most likely. Tom, please handle the last TODO in
Tokeniser, as I don't know how to remedy it