Simplify makeprg and efm somewhat.