GEN: remap built-in and refine keyword processing