Fixes several cosmetic issues with collections.