Fixing ambiguity bug in variable name expansion.
Authored by: debug 2009-07-28
Parent: [r5563]
Child: [r5565]
