Continued improvements for Class/BatchClass creation.

Incomplete; several tests fail.