Make sure state file data types match the struct datatypes

In legacy/trac#27491 (moved), a developer submitted a patch with mismatched state file and state struct datatypes.

I think that nickm did something to our options code to avoid these type of errors. Would it work for our state file code as well?