Remove expansion of variable to fields outside of select

Closes #236.