Smarter refactoring for prompt response

[#39917671]
Ah, there's what I missed. [#39917671]