There are a surprising number of subtle corner cases here, and I
think I have handled them all correctly, but caveat emptor...