New: Uniformize hooks.