Describe the enhancement requested

When reading the Grouper-related code for another optimization I'm working on, found some cleanup can be done ahead.

Component(s)

C++