Merge branch 'rs/parse-options-dup-null-fix'

Code cleanup. * rs/parse-options-dup-null-fix: parse-options: avoid arithmetic on pointer that's potentially NULL