svc: Move close processing to a single place