Avoid eval(parse(...)) internally

Avoid eval(parse(...)) internally #3091