Pass Bundle to ScopeAugment
Constify, scope down ScopeAugment
Remove useless call to ScopeDeleteVariable