Better squashing.

Author: assertchris

source/Optional.php

@@ -17,6 +17,10 @@ class Optional
      */
     public function __construct($value)
     {
+        if ($value instanceof Optional) {
+            $value = $value->value();
+        }
+
         $this->value = $value;
     }
 
@@ -47,10 +51,6 @@ public function __call($method, $parameters)
         if (is_callable($callable)) {
             $result = $this->callWithParameters($callable, $parameters);
 
-            if ($result instanceof Optional) {
-                $result = $result->value();
-            }
-
             if ($this->isNotNone($result)) {
                 return new Optional($result);
             }