The FIXME's are there for a future cleanup run in `modules.py`, but are not related to Lmod. Let's not further blow up this PR so we have to spend another hour to rerererereview it.