Changed completion to select only the parameter and not the commas
changed completion to select both commas and non-commas using single Tab and double Tab.

The reg exp's used to get this were:
\$\{2:, \\\\(\$.*?\})
\$\{2:, \$\{3:\\\\$1\}