Small cleanup in Connector