diff-parseopt: correct variable types that are used by parseopt