Improve Guava usage.