Fix TableGen warnings. This partly reverts my previous change to this file,