Inline http2 fixups

[rnro]

There are a few places where bugs / poorly structured code crept in during the inline multiplexer work. This attempts to address some of them:

• overly long lines
• mis-named variables
• unnecessary use of generics in one case