Various procmail tidy-ups