These SavePoints are bringing some noise here. There was a discussion in #211 about removing them: if we do that, we could simplify the changes here.