Support gauche/keyword.h
Code cleanup