Manually merge my qmail patches for #126
Minor cleanups