Merge pull request #288 from bekzod/small-util-cleanup

small cleanup in util

Author: stefanpenner

lib/es6-promise/utils.js

@@ -1,20 +1,21 @@
 export function objectOrFunction(x) {
-  return typeof x === 'function' || (typeof x === 'object' && x !== null);
+  let type = typeof x;
+  return x !== null && (type === 'object' || type === 'function');
 }
 
 export function isFunction(x) {
   return typeof x === 'function';
 }
 
 export function isMaybeThenable(x) {
-  return typeof x === 'object' && x !== null;
+  return x !== null && typeof x === 'object';
 }
 
 let _isArray;
-if (!Array.isArray) {
-  _isArray = x => Object.prototype.toString.call(x) === '[object Array]';
-} else {
+if (Array.isArray) {
   _isArray = Array.isArray;
+} else {
+  _isArray = x => Object.prototype.toString.call(x) === '[object Array]';
 }
 
 export const isArray = _isArray;