Move the abbreviated descriptions to the "abbrev" parameter, and use full strings for the descriptions.