I guess what I mean is that both the address mapper and build graph impls for v2 need a certain amount of translation code to convert v2 in/out. With the current implementation, address mapper ends up asking for slightly more work than is necessary and discards the extra