Cleanup and adoptations for Software collections.