Fixup ethan-wspace mode to handle Makefile's better