And add missing (unused) mappend instance
This makes bash completion work for git-annex test, and is generally cleaner.