Fix dependency definitions

Dependencies are currently incorrectly defined; e.g., the module is not defined as depending upon stream, but stream is nevertheless loaded and used for some functionality.