Simplify locking scheme
Simplify locking yet more; expand stripe size