Fix signature of WHAT and VAR.