Remove implementation from methods. Refs #9026.

- Update add to be const correct.
Merge branch 'feature/9026_composite_catalog' into develop