remove special treatment of hook vars