Cleaned up container enumeration some more.