In the MP-BGP PR, we are adding code that has separate types for v4/v6 but with per-AF impls. There are many cases where the logic is effectively the same for both paths (even down to struct member/method names) and that could be consolidated (e.g. making some things generic).
So this would be a nice cleanup to pursue when there's time.