It is remarkable how long it can take to pick up all the threads after a four-day weekend (since I took Friday off for Confusion). The good news is that I think I've got it all sorted out (and improved!) now.
The bad news is that I need to finish cleaning everything up. :)