Fix more patmatches that should be if/else.