Fix #1560 "NPE inserting phone number in repeat in builder"

Also:

- rename methods for clarity
- move delegate to Scala