MFC: r266820 (partial)

• Shrink the list of excluded modules to what actually still doesn't build as of r267058.
• Some style cleanups.

Approved by: re (glebius)