Handling hook installation and removal better.