Improve options with proper headers

This is a first step towards of my plans on refactoring of `HTTP::Options` .