Merge "Don't create C grammar for header gen" into main