More Password Gen cleanup...

... or at least, that was the intended goal. ;)