Handle delete_* capabilities consistently