Merge "Minor cleanup of Monitor::VisitLocks"