An easy mistake to make, as the form ostensibly requires a 'visa number', not a re-entry stamp number. I only mention it to help others not make the same error. No big deal...
Thank you, Tod. The Immigration website doesn't mention the affidavit it that context. It doesn't specify what 'evidence' of income is required. Pension statements worked to get my present non-O but, I bow to your collective experience.