A small tidy up around the handling of responses and IDs