Changes to w_class 6. Mild cleanup.