allow curly brackets in variables (and get rid of unnecessary VariableIncompleteEnd)