Got the tokenizing tidied up.