Continued improvements for Class/BatchClass creation.