Fix highlight.
Fix make_standard.