Fix upsert signature

Upsert always yield result so Option[T] should be just T.