Began improvements to Scoped.