nope - line 11 is correct, it should not be changed as you indicate. Look at the first few lines of my generated dialplan I pasted above:
exten => _./0000000000,1,Set(__FROM_DID=${EXTEN})
exten => _./0000000000,n,Goto(s,1)
exten => s/0000000000,1,ExecIf($["${FROM_DID}" = ""],Set,__FROM_DID=${EXTEN})
exten => s/0000000000,n,Gosub(app-blacklist-check,s,1)
exten => s/0000000000,n,Gosub(cidlookup,cidlookup_1,1)
You will notice that the first two are “_.” which is designed to be that way, since the desire is to catch DIDs that don’t come in as ‘s’. So you are going to have to have a look again at what is going on. You need to get the patch applied right so we can evaluate if the new dialplan is right or not (which it should be but needs other eyes).