Field names used in the option structure were slightly different depending on
whether the option value was an integer or a date. This is confusing.

This commit aligns the structure field names with the option names. It also
simplifies the logic for histval_file/initval_file option handling.