Fix: Rpush magic doesn't find local variables and doesn't support comma separated lists of variables

Described in issue #2550. This is a simple fix. It has tests.

Note. I submitted this PR a while ago, but then messed up my `git`. I did a hard reset and tried again. The old PR was #2552.