Update todo.
Implement AndExpressionTerm.

Includes skeleton for RegexpTerm.
Implement NumberTerm in stubber.