Refactor --diff-opts handling