Added logic for mapping Option[T] to (union [T] #or [Unit]).