Improves handling of forwarded headers. Fix #2094

Make these vals or lazy vals, rather than creating this structure every time it's used.