INT-1807 Use Intermediate Map

Separate the concerns - have the converter convert
the payload and selected headers to the map and leave
the serialization to the, er... Serializer.