Clean up eval usage a bit.