Fixes nested expandables, adds custom demo for that

Nested expandables probably deserve their own tests, at some point, but I need to get this merged in for the History page to work.