Fix the syntax to not use eval or overshadow variable bindings.