Index dict by tuple, rather than string

Remove the `ci()` function, which is used to create a string of index names, and instead index the dict of parameters using a tuple of indexes as the dictionary key.

You could then loop over the sorted set of keys for each parameter.