Fix excessive use of logic.