Unroll sole use of SV_IMPL/DECL_LOCK

Change-Id: I0d4691f700a415d0376e2bc346bc51fbf6a000b2