minor performance optimizations on new locking scheme