Eliminate smartmatch warnings.
Remove use of given/when.