Fix indentation-related regressions
Manually word-wrap the help messages