Correct sanitization of option fields.

@coenjacobs if we do do another maintainence release, this one would be
beneficial