Cleanup pass on mkpasswd.c