Split the patches into several files. Submitted by: Matthew Hunt <mph@pobox.com> (Closing PR #3003.) Also, style tweaks on Makefile.