Enough of this for tonight.

Come clean-up, I think.  Nothing's changed from last commit.