Refactor how delivery context is propagated to consumers

 * Remove unnecessary arguments/fn heads
 * Rename delivery context argument to be clearer
 * Fix documentation