Thanks guys -- i've put in the patch, but made a small change. I think (especially for diagnostic purposes) it actually is quite valuable to have the username in there.
I've also changed the password so that it's obfuscated instead of removed altogether. So for debug/learning purposes, it's obvious that the password is actually part of the array -- it's just not showing.
Take a look and let me know what you think.