Get rid of `eval`s for the sake of CSP
Work in progress