Simplify some Makefile rules