Use pre-order traversal when simplifying CondTree's.

Fixes #676.
Merge ../OdHac/cabal