CLN: give everything that needs it a closing context manager