Style cleanups, no functionality changes.
Style cleanups, no functionality changes.
thread-safety: More locks added.