a bit of Makefile and string constants cleanup