[BUGFIX beta] Consistently use isStream helper.
Merge pull request #9913 from rwjblue/use-is-stream

[BUGFIX beta] Consistently use isStream helper.