Add filter-identity, remove-{nil,false}