Refactor CollectionProxy.