Merge pull request #134 from jDramaix/jd_fix_scope_conditional

Reintroduce scope for constant nodes