Used a slow afternoon to get the next example42 to pass its tests again. Also rebased my sundry of changes from last year on top of the upstream development since then. I’ll drip in the commits later one by one to avoid a too confused git history.