Refine cleanup of failed OTU mappings; fixes #344

We're now much more careful about when to clobber failed OTU mappings,
so as not to force doomed retries.