Clean up, fixing makefile rules.