Tom,
How are the out-of-scope beans garbage-collected?
I would say that the afterCompletion seems to be the most intuitive solution rather than a new SPI. As you say, this should be compatible with the wording around not being able to rely on the context at this point.
I agree, I've updated the document.