Remove some lingering Guava 18 syntax, fix checkstyle issues