Add patch from kojiro to support keyword removal and all