Switched to using inlineCallbacks to handle some deferreds.