remove the tedious/needless "if passed" phrases

Also, improve a statement that can be mistaken to mean that assigning
None to some argument does not count as "passed".