Large refactoring of rollback code: