KCINFR-979: replacing PD, Budget, and other references in s2s

Dunno why I didn't see this before, but in merging changes, these aren't equivalent. First you are still taking a doc arg, but never using it, and you don't fall back to picking up the first complete budget if it exists. Was this intentional?