Fixup opt to reduce the amount of odd if statements.

Fixup opt to reduce the amount of odd if statements. #1906