Fix conditional expression branch evaluation Could be more efficient, but this is the correct behaviour