Always include version in list without flag.

As requested in original PR (#1617).

Also remove some extraneous whitespace that crept in.