Replace if/else with return match

Replace if/else with return match #30572