This leaves some vestiges of the old locking, including style
bugs in it.  I've only noticed anachronisms in socketvar.h so far
(I've merged net* but not kern or all of sys).  The patch also
has old fixes for style bugs in accf stuff and namespace pollution
in uma...  The largest style bugs are line continued backslashes
in column 80 and (these are fixed), and starting the do-while
code for the new macros in column 40, which is quite unlike the
usual indentation (see sys/queue.h) and not even like the indentation
for the old macros (column 32) (this is not fixed).