Refactored proxy handling in abstract scope.