Skip unneeded (and sometimes wrong) vars in call-hooks