Fix variable type highlighting being too greedy. (#17)