perf: replace the use of opt with the more efficient cond.

perf: replace the use of opt with the more efficient cond. #2305