a little cleanup here, and allowing nesting of collapsibles