Small cleanups to stream timeout configurations
This is a follow-on branch to !171 (merged), to try to improve uniformity in naming (and make some stuff not-public).
This is a follow-on branch to !171 (merged), to try to improve uniformity in naming (and make some stuff not-public).