More hacks so units follow paths relatively smoothly, and to avoid pathfinding in simple situations This was SVN commit r7296.