I'll do that in #741 but I'm not sure how that will affect this PR.