Put block length computations in a more logical order.