Adjusting emission of When branches such that interim When statements that lack statement list bodies are not emitted (mirrors the tracefile).