More hand made fixes to last commits, phpdoc cleanup.

src/CallbackHandler.php

@@ -27,7 +27,7 @@
 class CallbackHandler
 {
     /**
-     * @var string|array PHP callable to invoke
+     * @var string|array|callable PHP callback to invoke
      */
     protected $callback;
 
@@ -54,7 +54,7 @@ class CallbackHandler
      *
      * @param  string                       $event    Event to which slot is subscribed
      * @param  string|array|object|callable $callback PHP callback
-     * @param  array                        $options  Options used by the callable handler (e.g., priority)
+     * @param  array                        $options  Options used by the callback handler (e.g., priority)
      * @return void
      */
     public function __construct($callback, array $metadata = array())
@@ -160,7 +160,7 @@ public function getCallback()
     /**
      * Invoke handler
      *
-     * @param  array $args Arguments to pass to callable
+     * @param  array $args Arguments to pass to callback
      * @return mixed
      */
     public function call(array $args = array())