Further hook micro optimizations