Remove a '*-smart-*' funcitons.
Fix regular expression for highlight.