Move core extensions into term.
Make AndExpressionTerm coerce values to terms.
Update todo.