Re-organization, added hook_tokens_alter.