Work around bugs in jmap revoke processing and in the cleaner