Issue #222: Consistency on the token entity controller.