Restructuring pass 1.