Did some work on the golfed tokenizer