A few more warnings silenced when using smartmatch

This is turning into the most annoying change in perl I've had to deal
with in a long time.