Issue 709: externalize guava dependency