[Fix #749] Replace a few more 'face references with 'font-lock-face