Re-order arguments to extract to put trailing callback