Cleaned up hook invocations.