Improves handling of forwarded headers. Fix #2094

I think let it be... no point in prematurely optimising things.