Use Guava 15.
Various fixes and tidyups.