Attempt expansion of naked nested scalars in ExpandListEntry

Close #5480

(cherry picked from commit d2033f2554c743f60bf64301cb35773578543fd3)