First pass at removing eval() calls