Kept delegateProxy around and deprecated it. Improved indentation.