         unless not cb? or typeof cb is 'function'
             throw new err.RqlDriverError "Final argument to `close` must be a callback function or object."
 
-        wrappedCb = (args...) =>
-            @cancel()
-            if cb?
-                cb(args...)
-
         # This would simply be super(opts, wrappedCb), if we were not in the varar
         # anonymous function
-        HttpConnection.__super__.close.call(this, opts, wrappedCb)
+        HttpConnection.__super__.close.call(this, opts, cb)
     )
 
     _writeQuery: (token, data) ->

    _delQuery: (token) ->
        # This query is done, delete this cursor
        delete @outstandingCallbacks[token]

        if Object.keys(@outstandingCallbacks).length < 1 and not @open
            @cancel()

    _processResponse: (response, token) ->
        profile = response.p

            unless key in ['noreplyWait']
                throw new err.RqlDriverError "First argument to two-argument `close` must be { noreplyWait: <bool> }."

        @closing = true
        noreplyWait = ((not opts.noreplyWait?) or opts.noreplyWait) and @open

        new Promise( (resolve, reject) =>
            wrappedCb = (err, result) =>
                @open = false
                @closing = false
                @cancel()
                if err?
                    reject err
                else
