Better SwiftClient.stream implementation, fixes all around