More Guava-izing