Make constraints more uniform

Express coupling constraints in a more uniform way,
always in the form next(d,t) rather than using prev()
in one case (delta) and next() in the other (storage).