Some cleanup of the ec-evaluater to make it work for section 5.5