Good point, however I don't think it's worth breaking backward compatibility (with serialization) if we can avoid it.

Sorry for the bad suggestion.