Fix for changes in CallableWrapper.