Minor Makefile tidying