[PATCH v3 0/2] Refactor and improve full help output from tools