Cleanup. Little new functionality, but it now exits cleanly.