A few simplifications and stylistic improvements, found while grepping
around for makefile problems elsewhere.