Simplify hook hygiene