>Just for completeness, let's update the docstring to say it exits. Then I think this is ready for merge.

Yep, I agree...