MFC: r266820 (partial)

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