More syntax highlight fixes.