May just want to do that as a separate commit/PR; this PR moves a lot of stuff around so I don't want to leave it open for too long if we can avoid it.