Improve CompositeList type-safety.