Rewrite single token consumers to share code