Use ifnone in Enum.find for all collections

Closes #1653