Align management and representations with the upstream Guava version