I thought about that, too, but then I saw how it is done above (exit command).
But yes, this sounds reasonable. Will change it tomorrow.