Don't always use the `batch` API

Currently the service, regardless of whether `defer` is active or not, will always use the batch API. This is a bit of a lazy approach, instead we can determine whether we are deferring and decide which endpoint to use.

So, when not deferring, we would use the specific track and identify endpoints to ensure we are doing things that make a little more sense and 'as expected' for the developer.