First pass at removing some duplication from the Makefile.