Minor cleanup after reviewing the tag change code