[CSharpBinding] Improved semantic highlighting