=str: #16285: Expand should not drop elements on completion

Yes, true. My preference is not very strong, so unless someone else feels more strongly about this you are free to ignore me ;-)