Improvements to collection handling and such stuff.