More code reorganization for AbstractConnector and ConnectorFactory.