scsp: no C/P#extend, refactor stream