Just creating this issue to record my intent to do this work, since I'm not going to do it immediately.