Rewrite in single-step style.
Add propagation of `Fin x` across conjunctions.