Fix collection return values when setting/removing `[]` and `null`. Ref #419