Support streams and fix Marshal for 'p4 cstat'