Fix elint warnings about error symbol in condition-case
Add highlight-cl