> I still do not fully like the handling of CLASS Any suggestions how to improve it? > but I think the patch > is still an improvement and thus OK for check in. > > Nit: You miss a space after CLASS_DATA, e.g. Fixed this and committed as r160060. Thanks for the review. Cheers, Janus