Now evaluating within the same binding so that the local variables stay usable.
Now the primitive type completions work correctly.