remove NoLockFactory; don't wrap LockFactory (just wrap lock returned from makeLock)