should this be handled here or in `Evaluator.parse`?