- Clean out some C++ style comments (our coding style only accepts
  C-style comments. Anyway these comments were just old useless code).
- A block indentation fix.
- As a guideline, it is better to keep a GError as the last parameter.
- In non-interactive mode, the new procedure must use the value in
  parameter, otherwise passing the password just doesn't work.