Remove use of extract() throughout Stream

Resolves #556

Good times fixing this with @lukecarbis :wink: