Emit phone both with and without leading + if it has one.

Fixes #343