Simplify away redundant test, and document what's going on.