fixed templates in stream/stream.h and util/variable_set.h