Also adjust test cases to not fail if --help doesn't succeed, at least it doesn't for me if run as non-root.
Instead of writing `}; # if', write just `}' as was discussed here: http://www.mail-archive.com/bash-completion-devel@lists.alioth.debian.org/msg01815.html