Should make it easier to maintain, and ironically it also fixes the issue with .mjs files from this morning.