Simplifications in source.
Merge branch 'master' of github.com:biboudis/sml-streams