I actually feel that shared_ptr is a better fix, because that makes the memory handling consistently opt-in, instead of inconsistent.