More fixes to class-based CS for ex2_29a