Hi Jiewen,
I agree with your proposal and implemented the changes you proposed here: kuqin12/mu_basecore at personal/kuqin/var_check (github.com). Could you please take a look?
Both traditional and standalone instances are tested on our platforms internally, which rendered no issues on compilability or functionality.
Regards,
Kun