Improves handling of forwarded headers. Fix #2094

Hmm... I wonder how this performs.  Scala parser combinators are not fast.