Some minor cleanup, make note of a case that came up in my
testing, and fix a minor bug.