Rewrite to the CodeEvalFactory over a major design flaw.
Small code improvments.