Unrelated to these changes, but shouldn't this ` || false` be put in the `_.defaults` above (line 276)?