Cosmetic Makefile.am cleanup