Incorporate Paul Fox's changes that group the commands by functional groups.