Got rid of useless variable (requested by David)
Got rid of redundant test of have_tuple_lock
80 column wrap...