Improved the regexes for malang-mode a bit