Merge "init: simplify keyword_map"