Tweak to be a little more general.
Tweak to be a little more general.

This also corresponds with how the map key identifier shortcut is
defined.

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