Add default-value check to binary option logic, so warning is not emitted
in the default case