Unify conditionals and reformat.