This is an almost purely editorial change. It consolidates the description of QHKDF-Expand and corrects a bunch of minor things related to key derivation and expansion. This is the parts of #1043...