Resolved ambiguous references to lock_guard.

IMO: This is a good change.   Makes the locks explicit for platforms where this is necessary.