I'm not coming up with anything clever right off the top of my head, so maybe we take this as a separate issue to handle apart from this PR? You could even enter an issue to make sure we don't forget about it, but I don't see the duplication as a blocker for getting this merged--sorry if my comments made it sound like it!