Several more patches, mostly for formatting.

To taste, of course, but I like it.  Let me know if you have change suggestions!