Clean up running of stages a little bit.