* asf: clean up + use stream_* (It's not yet well tested)