Factor out expression construction. Add other ww assumptions.