Ensure insertion order when using parallel servers

Apparently such beasts exist.
cleanup