Finished implementing tag consolidator.
Minor cleanup elsewhere.