@diox I'm not even sure that `success` flag is useful anymore given that we now `raise` just after anyway.