Narrow some eval blocks. bugid:111222