Progress on unification of adaptivity mechanisms with the rest of the code.