Fix PR3408 by making a non-obvious assumption very obvious, and