Further simplify Makefile

No functional change.