Well ok, I just wanted to get rid of the token entirely. But I agree, some future function might end up having to special-case as well so I better leave it in.