I'm not convinced that I'm doing the right thing, but as Andreas asked for a merge request, so here it is.
Grin.