Move more TSI routing key bindings into the common routing key subtable. (dm)