After hours and hours of attempt, I've finally got a few lines further down
compsys.yo (it's kind of dense, you need a machete in here).  Here is the
result.  I've still got the last third to go.  There is also a fix for the
metafaq entry I added.