Fix identifier shortcut, and generalize the general form per revised spec.
Fix identifier shortcut, and generalize the general form per revised spec.

danfuzz/samizdat,danfuzz/samizdat,danfuzz/samizdat,danfuzz/samizdat