Cleanup an expression and avoid fail_with