minor refactoring and changes to treat collection clones as non-aliased