Cleaned up Stream Derivation handling.