#88 - Get rid of evals in regexp.