Adjust identifier-matching regexps.

This makes better use of regexp syntax classes. It also plays better
with the upcoming 24.4, where cl-lib-highlight is no longer needed
anyway.