Also remove some duplication around address/index parsing.
Attach a file by drag & drop or click to upload
