build: Tidy up a bunch of tool Makefiles, and simplify where possible using the