Fix compile errors, update the evaluator a bit.  Evaluator is NOT lazy,
however.