Fix a few stray references to expression eval functions that don't
exist anymore or don't take the same input representation they used to.