New version of "extract class".