stac simplification.
providing the expr to the fold.

- also, a bit of refactoring.