api: simplify nested handler construction
api: fix style of Server header assertion
Merge pull request #939 from bcwaldon/hdlr

Handler-related cleanup