Remove some debug #ifdefs (oops).  Other lock support.