Cleaner Makefile, "dummy" first-order unification for elaborator.