whack indicator tokens too