Adjustments to how view scoping work.