Clean up re_eval a bit