IDEA-93452 Implement "section" support in rearrange menu: cleanup