Bug 942167: Fix variable expansion r=bustage