language changes: Container -> Collection, some borrowck fixes.