Don't leave empty containers when unsetting a property