Improve default keyword_patterns