Fix Yoda conditionals