Changes to help with implementation of derivative hook.