Small code cleanup.
No idea what I did here, but it's probably important. Oh, and eval changes.