Makefile cleanup.

Some cosmetic touchups that I don't want to lock into a long-lived branch.