-Fixed highlighting bug to do with closed contexts and our desire to highlight the names of variables/functions
-Bugfix for top-level completions in some cases