Fixing some parsing errors
Use same rules for variable instance as with variable names