wip-442: Token aware writes

If you didn't have those Boxes, those 2 lines would not be needed - saving two memory writes :)