wip-442: Token aware writes

Shouldn't it be called `pop`?