Cover more cases when determining the tagger icon.  Fixes #21.