And a couple more cleanups in the Makefile