Optimize away two minor conditional branches (and improve test coverage).