Patches nightly problem by adding explicit predicates

Adds explicit predicates in stream_definition cleanup
Merge pull request #478 from lukecampbell/nightly_fix

Patches nightly problem by adding explicit predicates