Initial work towards 'expandedByDefault'