r283: Rename if-1,if-2 to if1, if2