Replaced hook-calling for multiple functions by proper `define-hook` versions