More work on stream editor.