Improve conditionals (#2845)

8 files changed