And fix a bunch of resulting issues (mostly just some pretty benign assertion errors).
Attach a file by drag & drop or click to upload
