Add Guava, minor null refactoring.
Provide instantiation for tests and @notnull.