Simplify/fix middle object sweeping.