I mean, that weird dep was always weird, we just hid the weirdness by putting Address in base and giving it its own target.