Move diff code more into runner code.