No functional changes to `MoveWithinRange` nor `MoveAdjacentTo`. I've just moved around code to for allow better overwriting.