@tjfontaine util._makeCallback is already accepting a rethrow function. Could you please elaborate a little bit more on what should it look like? (I understand the callers of makeCallback could use util._makeCallback directly and I can change them in the next commit. Is that what you mean?)