Revert the default value of MapTypes.valueContainsNull.
Change the default value of ArrayType.containsNull to true.