Refactored putting conds into their canonical forms.