Minor tweaks to tag stripping.