small fixes from review

4 files changed, 19 insertions, 23 deletions

diff --git a/lib/apply.js b/lib/apply.js
index b1ca55a..06f630a 100644
--- a/lib/apply.js
+++ b/lib/apply.js
@@ -45,7 +45,7 @@ import slice from './internal/slice';
  * two
  * three
  */
-export default function(fn/*, args*/) {
+export default function(fn/*, ...args*/) {
     var args = slice(arguments, 1);
     return function(/*callArgs*/) {
         var callArgs = slice(arguments);
diff --git a/lib/internal/consoleFunc.js b/lib/internal/consoleFunc.js
index 92f7e86..eb2e886 100644
--- a/lib/internal/consoleFunc.js
+++ b/lib/internal/consoleFunc.js
@@ -5,20 +5,20 @@ import wrapAsync from './wrapAsync';
 export default function consoleFunc(name) {
     return function (fn/*, ...args*/) {
         var args = slice(arguments, 1);
-        wrapAsync(fn).apply(null, args.concat(function (err/*, ...args*/) {
+        args.push(function (err/*, ...args*/) {
             var args = slice(arguments, 1);
             if (typeof console === 'object') {
                 if (err) {
                     if (console.error) {
                         console.error(err);
                     }
-                }
-                else if (console[name]) {
+                } else if (console[name]) {
                     arrayEach(args, function (x) {
                         console[name](x);
                     });
                 }
             }
-        }));
+        })
+        wrapAsync(fn).apply(null, args);
     };
 }
diff --git a/lib/reflect.js b/lib/reflect.js
index d61c31e..f50d817 100644
--- a/lib/reflect.js
+++ b/lib/reflect.js
@@ -44,17 +44,17 @@ import wrapAsync from './internal/wrapAsync';
 export default function reflect(fn) {
     var _fn = wrapAsync(fn);
     return initialParams(function reflectOn(args, reflectCallback) {
-        args.push(function callback(err, cbArg) {
-            if (err) {
-                reflectCallback(null, {
-                    error: err
-                });
+        args.push(function callback(error, cbArg) {
+            if (error) {
+                reflectCallback(null, { error: error });
             } else {
-                var value = cbArg;
-                if (arguments.length > 2) value = slice(arguments, 1);
-                reflectCallback(null, {
-                    value: value
-                });
+                var value;
+                if (arguments.length <= 2) {
+                    value = cbArg
+                } else {
+                    value = slice(arguments, 1);
+                }
+                reflectCallback(null, { value: value });
             }
         });
 
diff --git a/lib/waterfall.js b/lib/waterfall.js
index e4c033a..092f3ac 100644
--- a/lib/waterfall.js
+++ b/lib/waterfall.js
@@ -68,13 +68,10 @@ export default  function(tasks, callback) {
     if (!isArray(tasks)) return callback(new Error('First argument to waterfall must be an array of functions'));
     if (!tasks.length) return callback();
     var taskIndex = 0;
-    var args = [];
 
-    function nextTask() {
+    function nextTask(args) {
         var task = wrapAsync(tasks[taskIndex++]);
-        var taskCallback = onlyOnce(next);
-        args.push(taskCallback);
-
+        args.push(onlyOnce(next));
         task.apply(null, args);
     }
 
@@ -82,9 +79,8 @@ export default  function(tasks, callback) {
         if (err || taskIndex === tasks.length) {
             return callback.apply(null, arguments);
         }
-        args = slice(arguments, 1);
-        nextTask();
+        nextTask(slice(arguments, 1));
     }
 
-    nextTask();
+    nextTask([]);
 }