Improve variable parsing when generating MINFO