Rework combined-hooks mechanism.