Ok, all of Monday's patches have been committed. I made a few
minor changes (mostly because I cleaned up some things in earlier
submissions which you then also cleaned up in a later submission).
-Matt
