More deprecations, annotate eval.