Add a test for this specific corner case that I wasn't sure would work--looks like it does.  Renamed a misnamed test too..
I've done so much work on this I think I should just check it in a WIP before something tragic happens...