more refund cleaning (bug 1026283)
Merge pull request #2626 from andymckay/1026283-three

more refund cleaning (bug 1026283)