Attached diff is a suggested change to simplify[citation needed] the
yfile stuff (only one change is needed to add a new yfile).

There's probably a better way to do it, but I'm not a mk wizard.