Fixed one more compilation error and made a temporary fix of
NonTerminalType.