Improve Stream and Observable support.  Minor code cleanup