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