This and some of the changes below change unrelated code, mostly un-wrapping lines from what I see. I'd rather not have unrelated changes mixed in.