Merge "Add some infrastructure to support rescoping."