Major overhaul.

Substantially simpler description of MX and non-MX cases.