Some minor fixes. API change: "orElse" can now also be a callable.