Refine cleanup/1 proposal

I also renamed it from defer/1 which has too ambiguous a meaning.