[dfmc,macro-expander] Remove unused *trace-stream*.
Merge pull request #707 from waywardmonkeys/remove-trace-stream-from-macro-expander

[dfmc,macro-expander] Remove unused *trace-stream*.