Sync with -current:

1. Fix a typo in a comment.
2. Merge macros that abstract locking and memory allocation.
3. Use the right bit of constant data when finishing hashing the name.