Fix smartmatch warnings