[arch-general] [PATCH 08/48] Slightly simplify hook-running infrastructure.