Removed or moved multiple calls to LOCK (affects multiple classes inheriting from Lockable).