Editorial changes.

Emphasising what belongs together.

And some simplifications / generalisations.