More work on parsing addresses