Fix building of keyword non-terminal