A little more cleanup on calculateRunDimensions