* avi: use stream_*, some clean and reordering.