Fix Makefile.am's so that "make distcheck" works again
Whitespace fix
Move "append_serve" to library, too.

That completes what can be moved without rewriting anything.
Update comment to reflect today's realities
Separate out a useful macro
Add a check for append_serve, too