Nulls are only problematic here with immutable lists, I think. ImmutableMap.Builder.put should not throw NPE. I have to still run some live tests for this change.