Dry

Hi Eliot,

I've made several changes trying to fix my shallow nesting pull request, mistakenly on my DRY branch, without really getting anywhere. I've also made the changes instructed by Bloc to DRY the destroy code, and without fixing the shallow nesting issues it's hard to tell whether the DRYing code is working. But I think I need to move on to the next checkpoint for now . . .

Thanks,
Ellen