Progress on clearing up adaptivity.