Moar restructuring fixes.