More adaptivity-related progress.