So I think I was certainly partially wrong. 1602 should probably keep forwarding the fallback and cleanup, but line 1601 should continue with halts as the cleanup should not be done by the tail. I have updated the commit to reflect this.