internal/core/adt: move cycle state saving logic to Expr

internal/core/adt: move cycle state saving logic to Expr #2008