More minor changes to Section 3

Moved some explicit definitions of types around so as to give uniform
presentation of them after the definitions.