Collapsible: Address #6163.
Collapsible set: Implement "enhanced" option and address #6163.
Integration tests: Collapsible: Twiddle with some options to make sure they get set/unset correctly.