Correct options handling. #9723
New version of Thor options hash has keys as strings.