Improve streams

It's OK not to have blank lines between one-line methods, but multi-liners should definitely be separated by a blank line. (There are quite a few of these in this PR.)