Eliminate smartmatch deprecation warnings.