These variables aren't really used for anything interesting, but it
seems the existing grouping was somewhat nonsensical.