Clean up comments
Cleanup and more vars.
Fix for pgauth. Var names.

Uses nested arg names.