Eliminate extra newlines.

* No additional trailing newline after the last type in a file.
* No additional newline between package and types when there are no imports.
In this specific case, just remove the lone newline and invert the two lines inside the for ooop. (I had made that change locally already)