Further simplification of Makefiles.