Add scope machinery, and make PreUniverse update work.