Minor cleanups in the top-level makefile in prep for merge to trunk.