Please import this patch. It updates the Config.help entry (which some
people requested) and cleans up coding a bit. No functional changes.