Some prep work for rolling which should simplify our walk-run logic without breaking anything.