fix: use simple checking only if required
fix: use simple checking only if required
fix: check hook modifier deeply
fix: header order fixes compilation on OS X