Simplify some conditionals