Fixed: variable initialisation scoping.

Previously all space and commas were matched into a variable
scope, which caused problems with word selection.