Get rid of some unnecessary Promise bind()s