Also some cleanup, mostly to avoid storing separate address convention object,
which is not really necessary.

Change-Id: Id3e104043f08b6786de2e91d69361557b83890f9