     position = Point.fromObject(position)
 
     {openScopes, tags} = @tokenizedLineForRow(position.row)
-    scopes = openScopes.map (tag) => @grammarRegistry.scopeForId(tag)
+    scopes = openScopes.map (tag) => @grammar.scopeForId(tag)
 
     startColumn = 0
     for tag, tokenIndex in tags
       if tag < 0
         if tag % 2 is -1
-          scopes.push(@grammarRegistry.scopeForId(tag))
+          scopes.push(@grammar.scopeForId(tag))
         else
           scopes.pop()
       else

        if tag % 2 is -1
          startScopes.pop()
        else
          startScopes.push(@grammarRegistry.scopeForId(tag))
      else
        break unless selectorMatchesAnyScope(selector, startScopes)
        startColumn -= tag

      tag = tags[endTokenIndex]
      if tag < 0
        if tag % 2 is -1
          endScopes.push(@grammar.scopeForId(tag))
        else
          endScopes.pop()
      else
