Couple of cleanups and clever junk.

I expect that you might want to cherry-pick bits. This is mostly a "hi. I think that you're doing it right" comment. Here's some of the cool stuff I'm doing with your starting point.

More tweaks to follow later, when I've installed it on all of the company servers that I have ssh access to.

David.