Improves handling of forwarded headers. Fix #2094

I think I'd rather default to `x-forwarded`, since it's going to take a long time before `forwarded` is in common use.