Finished adding eval support.