Completely re-do out-of-order class declarations.