Don't generate type enum anymore.

Include field count in X table.