Makefile: remove more deferred variables