Be more specific when adding the Expand All/Collapse All controls. Fixes #1751