The logic was overly complicated, and the "source" and "line" fields were getting ambiguous. This standardizes with the protocol, and reuses the appropriate response in the deferred workflow, with a lot less state to track.