Merge "Replace run-time stream types by compile-time"