For consistency, wouldn't it be easier to always give a buffer and make it fill that with the versioned classname? Then we'd have the exact same versioned classname used everywhere, and could get rid of that NULL magic.

Regards,

Fabian Maurer