#392 Couple of completion/highlighting/parse bugs