Simplify spin blocks, removed un-needed lock.