Improve backcompatibility, Makefile template and wrap-with.el.