More work.

Covering tuples and dictionaries.