Code cleanup, no more use of eval.