Better Tokenizer Fix 04 (ACTUAL)

The real Fix 04. With some more changes.