Fix args appearing when variable names contain %n, etc.
Merge pull request #389 from LLK/args-in-vars

Fix args appearing when variable names contain %n, etc.