Replace redundant inlineCallbacks in places where return can be used on last line of function