Be less eager about fixing variables in the Makefile.