Tried the smallest giant lock. Code cleanup.