[DDMD] [refactor] Fixup recent inliner changes

Two sets of variable declarations moved to their uses, and one shadowing that I accidentally introduced which luckily did not change behavior.