Long delayed refactor, avoids a few more allocations.
Attach a file by drag & drop or click to upload
