Refactor the grammar a bit to implement TableGen/ForwardRef.td