Replaced argument handling of to-many remove handler with more robust logic as in the add handler