Combined a few points to make sections 4.2 less fragmented.