Remove Guava Joiner #95, fix tests.