fixup
Remove deprecated EitherEventStream.
Fix a test case.