Make compatible with Guava 16.0.