Improve completion for '--version' and '--help' option