Add $ to the end of regexps that should have it
Make the CC regexp also more accurate
Merge branch 'fix/regexp_end_match'

* fix/regexp_end_match:
  Make the CC regexp also more accurate
  Add $ to the end of regexps that should have it