Minor cleanup in DispatchProxyTemplate