Cleanup makefile transition cruft.