Mapping of container types to item types is not explicit and inconsistent between CS and Cayenne

Where?

What's the situation?

What does it make more difficult?

How can we improve it?