I've done this as part of this PR now...