Fix bug where var definitions would be striped of prefix/suffix

e.g.
// x = 10
would evaluate to
x = 10