2 kirigami fixes for a point release

[David Edmundson]

> Kirigami seems to be rather unstable, I wonder if anything can be done to
> improve upon that [*].
>

One important thing seems to have been getting sloppy in those repos;
mandatory code reviews.
That's an easy thing to enforce, and we know it makes a huge difference to code.

Even if no-one comments, the extra delay of it running on your own
system delivers a lot.

David