Bug 25261: (QA follow-up) Simplify tests and conditions