Update to Guava 15 and perform some type weakening