(I think the issue is that the wrong branch actually got submitted for this pull request and missed some of the last-minute fixes I made before I skipped town. They should all be incorporated in this branch now though.)