Also, clear up freed slots in containers. As a follow up to 32bef315.
Attach a file by drag & drop or click to upload
