Fix overzealous matching on URL; and fix "Non-string URLs" from Twitter.