difftool: Move option values into a hash