I think you can keep it here, and we'll (I and @bnoordhuis) address this issue later.