This is a subset of !978 (merged) that does not require a new gtkdoc/meson and can be merged right away.