At first I thought I might be able to remove the class var, but I didn't realize how chunks and I think formats have to load elsewhere (and later in the process).  I thought I may have done that change later, I'll check to make sure I don't have something I didn't push.  In any case, I'll add that change.