Thanks for the PR! These used to be required for the code to compile (we may have been using a different Promise type definition or something), and so we have these return statements all over. Would you be interested in removing all of them, or at least the rest of the ones in this file? Else I can merge this as-is, but it would be best not to do this cleanup 1 line at a time. :-)

Y, I’ll do that.

Closing in favor of #422 which is made against master