Refactor: add wire close and don't expose tomb

@mkobetic @boourns