Fix "merge bug" resulting from pretty badly rebase of my own.
Next step will be to use smarter uid conversion in uid2grp.c