Shorten: allow for some connector words.

Also, hide the fact that I previously committed a broken test.