All below are perfect subsections of the original file, except where noted.

Note that this will produce a lot of import cruft--we have quite a bit already, and it would take a while to work out for very little gain.  So just left that as-is.