Update to r43778:

Initial shuffle to improve flow and tighten up this section.
Subsequent commits will review the content.