Less crazy locking decorators.  (Maybe more broken -- not tested.)

Change-Id: Ib048c21f66926cb96ae02ced4bd16a752d52b301