Yet more work on address parsing