More password generation cleanup

... and the work continues.