Remove duplicated code.
Support evaluating top-level assignments again.