[OE-2682] Less clever address parsing.