Summary: Track intermediate states more precisely, according to spec.
Reviewed-by: twisti, forax