Merging fix-noweb after simplifying a few Makefile rules.