Fixed some-v contract violation in pretty-exception. Claimed some comments!
Merge remote-tracking branch 'origin/scope-rewrite' into scope-rewrite