*8087* Simplify conditionals