Some leftovers from !326 (merged)
Prompted by epiphany failing CI pipeline with warnings in libhandy headers.
