Fixup merge of if.c