Minor nit: we can have now `catch(assert.fail)` instead of `then(null, assert.fail)`.