Fix #56 by removing ambiguity over method of variable replacement.