Improvement in locking, reverted tuple->list change