Merge "Fix locking on string init map (again)."