Attempt expansion of naked nested scalars in ExpandListEntry

Close #5480