Fixed no-eval mode that removed all eval().