Make defined tokens a bit clearer