Fix detection of embedded objects.