scala/phone-number: Refactor.