Remove (almost all) references to privsep. This removes several do..while

Remove (almost all) references to privsep.  This removes several do..while
loops but does not change the indentation of the now-shallower loops,
which will be done in a separate whitespace-only commit to keep changes
of style and substance separate.