WEB-4356 and other nit-picks about removing collections. ...Now with actual code changes. :|