Changed behavior so that a unit either reinforces or moves, but not both.