Make it posible for success callbacks to emit two args to done

Closes #951