Stabilize ADD behavior

* Builder: fixed the behavior of ADD to be (mostly) reverse-compatible, predictable and well-documented.