Yet more Makefile tweaks/fixes.