Use pre-order traversal when simplifying CondTree's.

Fixes #676.