CRM-7964 remove Eval instances of new $string type