More Makefiles cleanup.