(more global lint fixes, that is -- clearly, fixing up the line you're directly working on is desirable)