Correct issues with fix for deleting phone numbers

Response to comments on pull request
https://github.com/dimagi/commcare-hq/pull/224