Trim whitespace.
Drop unused conjunction/disjunction flattening.