Make variable highlighting more specialized