More workarounds for Makefile insanity.