Fix #894: Add conversions for UndefOr

Ah no it won't typecheck.