I decided it was straightforward enough to do without PR. :s