First cut at reducing smartmatch and given/when warnings.