Reorder payload methods a bit.
Ensure abort is not logged if completed.