Some more SourceContext fixes. Mostly in DeliteOps
Reverting to non-hierarchical view for DEG