update a few more classes to be new-style

darcs-hash:20090226085946-b2873-e0b75efe4713aad3714bace3688fa8682656106b