We talked about #6800 at our meeting today and I committed a fix. I decided to go with a slightly different approach than the suggested patch, because the current preferred style is to have a single "cleanup" label rather than separate labels and cleanup code paths for success and failure. Thanks for the bug report.