Fixed trailing spaces. Also fixed the condition to add commas at the
help message of a series of flags.