Tuples should be in a sorted-map

Previously the tuples were in a map where the insertion and extraction order were unknown.  That poses problems for the **to-generator Rename** function which needs to have the tuple order to be consistent.

To quickly add an implementation I've used the Flatland/ordered library which has an ordered map.