Some final syntax highlighting updates