Align streamops according to Daniel's original code