Trying to fix makevars.