Also change identifiers to match the comments, and add more assertions. Fixes: debbugs:16234
Attach a file by drag & drop or click to upload
