Issue #3121289 by Dave Reid, DamienMcKenna: Normalize token types using the Token module mapper service.