Corrections following comments, eval removed.