Support stream comment more explicitly