* Fix issues with unloading transports by selecting equivalent units when needed.

* Use stream api.

* Restore if statement.

* Fix comment.

* Improve test coverage of function.