Fixed eval_args, fixed rewriting