r1739: Fixed dumb cleanup bug in first version.