Fix unit collection crates and drop-zone maps.

Cleaned up version of #5952.