Merge pull request #1910 from boqwxp/cleanup_ilang_parser