Only highlight in correct scope.

Closes #12. Closes #13.