Make unwrapWithFallback less pointy