It isn't the most elegant solution, but it wasn't clear to me that we should muck around too much with the build graph internals or address mapper semantics