relax token scope

See #2862.