Prepare to generalize simplification of assumptions in steps.
Improve some error reporting; TODOs.