OK, will be a less trivial PR, but I can sort that out.