Tidy Makefile variables, adding format variables.