Identifier: Fix thread-safety checker warnings.

Fix some uses of non-const static data.

These weren't flagged before due to an issue with the checker, to be fixed with a pending change.