@WalterBright I opened a PR #2540 for better C-main addition.