A further small refactoring to Guava ImmutableCollections.