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

Avoid eval(parse(...)) internally (#7156) #3131