Rearrange on-return stats counting to better count remote entries even if they are errors.