Make more use of Guava

Now that we use Guava, we should, well, use Guava.