Remove `r.expr`.
Revert changes based on rethinkdb/rethinkdb#3147.
Make auto generation active with new names.