Simplify MoveAdjacentTo logic. Fixes #5445.
Merge pull request #5489 from pchote/transport-fix

Simplify MoveAdjacentTo logic. Fixes #4449