Fix bug that highlighted non-variables in the middle of other object. Revert convention_variables to Identifier.