trivial: Add some class padding to avoid future API breaks