Fix #894: Add conversions for UndefOr