Agreed; done (commit 2e30641caa50fe66ee29a9eaeb10a19432fd007c)