Fix missing types in conditional expressions